(x_set_icon_name): Don't use arg if it's not a string and not nil.

diff --git a/src/ChangeLog b/src/ChangeLog
index 386ec5670d4f18e826a193b35ec6338dc77399a3..0b352232cb29c44086f21686054418c255cec07c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-03  Eli Zaretskii  <eliz@gnu.org>
+
+       * w32fns.c (x_set_icon_name): Don't use arg if it's not a string
+       and not nil.
+
 2006-06-02  Chong Yidong  <cyd@stupidchicken.com>
 
        * xfns.c (x_set_icon_name): No-op if arg is non-nil and not a

diff --git a/src/w32fns.c b/src/w32fns.c
index 609a88debbdea3794a7122496ed3680396ca5bfd..25aa22f0683ee8559e0886c97ee6151daf8583fe 100644 (file)
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -1683,7 +1683,7 @@ x_set_icon_name (f, arg, oldval)
       if (STRINGP (oldval) && EQ (Fstring_equal (oldval, arg), Qt))
        return;
     }
-  else if (!STRINGP (oldval) && EQ (oldval, Qnil) == EQ (arg, Qnil))
+  else if (!NILP (arg) || NILP (oldval))
     return;
 
   f->icon_name = arg;